Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 21 Jun 2011 14:45:53 +0000 (07:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 21 Jun 2011 14:45:53 +0000 (07:45 -0700)
commitf630d689e29adb26e2c3bcf3ada28e776373ee79
tree2b77be3e9f0808ef9d5a7ece5b593e659494ffbf
parent8a687ad42ecc9e6ed060278a14f0a5106762cb70
parentecb9ae1211bdde8ea87a26cfd7fc8de947c94648
Merge from trunk.